This paper proposes a 3-D non-hydrostatic free surface flow model with a newly proposed general boundary-fitted grid sys......